Ruby 1.9.3 and add ruby 2.2.0 support

Dominik Sander 9 years ago
parent
commit
7c43c6efa0
3 changed files with 12 additions and 12 deletions
  1. 1 1
      .travis.yml
  2. 1 1
      Gemfile
  3. 10 10
      Gemfile.lock

+ 1 - 1
.travis.yml

@@ -9,7 +9,7 @@ env:
9 9
 rvm:
10 10
 - 2.0.0
11 11
 - 2.1.5
12
-- 1.9.3
12
+- 2.2.0
13 13
 cache: bundler
14 14
 bundler_args: --without development production
15 15
 before_script:

+ 1 - 1
Gemfile

@@ -20,7 +20,7 @@ gem "google-api-client", require: 'google/api_client'
20 20
 
21 21
 # Twitter Agents
22 22
 gem 'twitter', '~> 5.8.0' # Must to be loaded before cantino-twitter-stream.
23
-gem 'cantino-twitter-stream', github: 'cantino/twitter-stream', branch: 'master'
23
+gem 'twitter-stream', github: 'dsander/twitter-stream', branch: 'huginn'
24 24
 gem 'omniauth-twitter'
25 25
 
26 26
 # Tumblr Agents

+ 10 - 10
Gemfile.lock

@@ -1,10 +1,10 @@
1 1
 GIT
2
-  remote: git://github.com/cantino/twitter-stream.git
3
-  revision: 1c60a1007c50476f23374a8aea796769a088ffe0
4
-  branch: master
2
+  remote: git://github.com/dsander/twitter-stream.git
3
+  revision: 1713b4fe5b387580364b39716bb5c26d6601c50f
4
+  branch: huginn
5 5
   specs:
6
-    cantino-twitter-stream (0.1.15)
7
-      eventmachine (>= 0.12.8)
6
+    twitter-stream (0.1.15)
7
+      eventmachine (~> 1.0.7)
8 8
       http_parser.rb (~> 0.6.0)
9 9
       simple_oauth (~> 0.2.0)
10 10
 
@@ -38,7 +38,7 @@ GEM
38 38
       minitest (~> 5.1)
39 39
       thread_safe (~> 0.1)
40 40
       tzinfo (~> 1.1)
41
-    addressable (2.3.6)
41
+    addressable (2.3.7)
42 42
     arel (5.0.1.20140414130214)
43 43
     autoparse (0.3.3)
44 44
       addressable (>= 2.3.1)
@@ -119,8 +119,8 @@ GEM
119 119
     erubis (2.7.0)
120 120
     ethon (0.7.1)
121 121
       ffi (>= 1.3.0)
122
-    eventmachine (1.0.3)
123
-    execjs (2.2.1)
122
+    eventmachine (1.0.7)
123
+    execjs (2.3.0)
124 124
     extlib (0.9.16)
125 125
     faraday (0.9.0)
126 126
       multipart-post (>= 1.2, < 3)
@@ -337,7 +337,7 @@ GEM
337 337
       uuid (~> 2.3, >= 2.3.5)
338 338
     rufus-scheduler (3.0.8)
339 339
       tzinfo
340
-    safe_yaml (1.0.3)
340
+    safe_yaml (1.0.4)
341 341
     sass (3.2.19)
342 342
     sass-rails (4.0.3)
343 343
       railties (>= 4.0.0, < 5.0)
@@ -452,7 +452,6 @@ DEPENDENCIES
452 452
   binding_of_caller
453 453
   bootstrap-kaminari-views (~> 0.0.3)
454 454
   bundler (>= 1.5.0)
455
-  cantino-twitter-stream!
456 455
   coffee-rails (~> 4.0.0)
457 456
   coveralls
458 457
   daemons (~> 1.1.9)
@@ -524,6 +523,7 @@ DEPENDENCIES
524 523
   tumblr_client
525 524
   twilio-ruby (~> 3.11.5)
526 525
   twitter (~> 5.8.0)
526
+  twitter-stream!
527 527
   typhoeus (~> 0.6.3)
528 528
   tzinfo (>= 1.2.0)
529 529
   tzinfo-data